Merge "Handle different device/activity orientations for camera compat." into main