Merge "SF: Introduce DisplayModeController" into main