Merge "Revert "Partial CameraManager implementation""