Merge "SF: merge BufferLayer and BufferStateLayer"