Merge "TEMPORARY FIX: add sync point logic to BufferStateLayers"