Merge "Caching between SF and HWC for BufferStateLayers"