Merge "Update typeId for BufferQueueLayer and BufferStateLayer"