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

Change-Id: I8c800c48ebc7e82bd33ea4dc12261a389db27fad