Merge "SurfaceFlinger: Drop input for blacked out layers"