Merge "[2/n] Integrate OptPropBuilder in LetterboxUiController" into 24D1-dev