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