Merge changes I14688f7b,I2c5de9d3 into tm-dev

* changes:
  SF: Clean up RefreshRateOverlay
  SF: Fix a mislabeled slice in traces