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

Change-Id: Ib357ab575168484bae20d8b37c332c5be042143e