Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57e5 am: 7a219bba45 am: dfd1011204" into rvc-qpr-dev-plus-aosp