Merge changes I842e39c2,I5d92eae2 into main

* changes:
  SF: Generalize immediate mode set to multi-display
  SF: Clean up DisplayModeSwitchingTest