Merge "Fix bubble transition hanging issues" into rvc-dev am: c6690dd46b am: 9fe6bf67ce

Change-Id: Ifa8f16ce3168e9f69ff46620b43d4b6ffe74844a