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

Change-Id: Idf9eeddd899813f125b985e0075d9acb751722ab