Merge "BufferStateLayer: Mirror BufferQueue behavior in fence merging"