Merge "Revert "SF: Flow DisplayModeRequest through mode set FSM"" into main