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

Change-Id: I0cebf62a934fc01000e9fa8ead86ce39cc2c6ae6