Merge "Clean up tracking of layers with buffers" into sc-dev