Merge "SF: Isolate modesetting in DisplayModeController" into main