Merge "Fix bubble transition hanging issues" into rvc-dev am: c6690dd46b am: 27810e79eb am: 1f2a39a7dd am: db6cc71af3 am: 8b2dc1929c

Change-Id: I5ff12dde1457a23c8f420419575fba1fcf8887fd