Merge "BufferStateLayer: Use mCurrentState for HeadFrameNumber"