Merge "Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880 am: dacdf42b" into rvc-d1-dev-plus-aosp