Revert "overlay: fix clean-up camera ui"

This reverts commit 86fdc7c2ccb90fe390a281898e9fc862b9045a57.
Revert "overlay: clean-up camera ui"

This reverts commit aec8b10cb8542d536eadc30add77f178ccccdf32.