Merge "Reworking layer/surface management"