Merge "Composite layers as regions." into honeycomb