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