Merge "Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57e5 am: 13d623015d" into rvc-d1-dev-plus-aosp am: 380189bdec" into rvc-qpr-dev-plus-aosp