Merge "Capture layer and children when calling takeSurfaceControlScreenshot" into sc-dev