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

Change-Id: I0709d192a518e16d9ff005b86c5ee22ba666e4a4