Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57 am: 13d62301" into rvc-d1-dev-plus-aosp