Merge "CameraManager: Enable override to portrait by default for devices with the system property turned on."