Merge "SF: Merge BufferStateLayer into Layer"