Merge "Add flag for changing the way activity is used onCameraClosed for camera compat." into main