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

Change-Id: I7ce4402753d3dc978c024a6930471b70f566ab53