Merge changes from topic "preferredDisplayModeId60120" into sc-dev

* changes:
  Enable preferredDisplayModeId for frame rate override
  Add preferredMaxDisplayRefreshRate