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

Change-Id: Iea9ccf765a29a2fcaf6ed0fcf42929458756252f