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

Change-Id: Ib5b10147cb8124adb44a1f46a4e6cc68085719a9