Merge "Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd3 am: f89f023f" into nyc-mr2-dev-plus-aosp