Merge changes I15e0f5a2,I0db8970b

* changes:
  SF: Obey active display's RefreshRateSelector
  SF: Do not deref empty std::optional<PowerMode>