Merge "SF: Use getVisibleLayers... in doComposeSurfaces"