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

Change-Id: I910bfeb7503ad3a24f7441617fab02bb9b495eaf