Merge changes Ib44ab2dc,I4404607e

* changes:
  SF: FrameBuckets state to SFBE
  SF: BufferingStats state to SFBE