Merge changes I355dea76,I63d21c22

* changes:
  SF: Simplify per-display refresh rate selection
  SF: Deduplicate FakeDisplayInjector