Merge "SurfaceFlinger: Remove reparentChildren" into sc-dev