Change exit animation to use normal z-order. am: a562fe4a23
am: f1963fe340

Change-Id: I53ae6e0e5735f20f5fe254d4d0380955be635b16