Merge "Add ORIENTATION_ prefix to @IntDef ScreenOrientation" into main