Merge "Change exit animation to use normal z-order. am: a562fe4a23 am: f1963fe340" into nyc-mr2-dev-plus-aosp