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

Change-Id: Id2091651ac40604e7c6870146574e6f8bc3736f1