Merge "[21/n] Reduce dependencies from LetterboxUiController" into main