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

Change-Id: Ie639712ce8b39b36db0d0b4667c1cc8b79664b5a