Merge "Continue to allow some orientation overrides" into main