Merge "Fix bubble transition hanging issues" into rvc-dev am: c6690dd46b am: 27810e79eb

Change-Id: I3d2e0979bfb21757a10885547504904668cf806f