Merge "Revert "Caching between SF and HWC for BufferStateLayers""