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

Change-Id: I2b9237270665c4f9f04d2583067e316ce788eb23