Merge "SurfaceFlinger: Fix reparenting following ReparentForDrawing" into pi-dev