Merge changes Id0af0598,Iebb77a33

* changes:
  SF: Don't store config ids in RefreshRateStats
  Add Fps class