Merge "Wait with reparenting back until all app animations are done" into pi-dev
am: 475fe3f13b

Change-Id: If88d3ff52402d14e5ae5eb4d8f4d1e849f6f9507