Merge "Change exit animation to use normal z-order." into cw-f-dev
am: 6abcefd350

Change-Id: I451251a4e1d579dfc10ab3ddaf4bdd5ee02e2372