Improve CameraHandler

Change-Id: If17c511b618340fdd36da7a7b84a6e3b8104380f