Merge "SurfaceFlinger: Only update client parent if set." into pi-dev