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

Change-Id: Ibe8c6a63cbb99424bf11d30d340714d9e099a50f