Merge "DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait." into tm-qpr-dev