Merge changes I0f37f856,I55dc5c2a into sc-dev

* changes:
  RefreshRatePolicy: a few fixes
  RefreshRatePolicy: getPreferredRefreshRate should consider preferredRefreshRate