Merge "SurfaceFlinger: Add sourceCrop to screenshot"