Merge "DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging"