Merge "Camera: set mNumberOfNormalCameras correctly"