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

Change-Id: I27fcff3a5ff910b07eb94f1bb231eace1d7d4f67