Merge "Merge "Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880b5 am: dacdf42b2c" into rvc-d1-dev-plus-aosp am: 2fb1cd38c5" into rvc-qpr-dev-plus-aosp