Merge "Camera: cleanup dead code"