Merge "CameraManager: Provide flag for overriding camera output to portrait."