Merge "Fix bubble transition hanging issues" into rvc-dev