Merge "SurfaceFlinger: Do not capture rounded corners on screenshots"