Merge "Don't update BufferQueue FrameEventStats when a frame is dropped" into sc-dev