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

Change-Id: Ia78b076dfa2e96a4a567d962ada8502fc9c5790a