Merge "Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87 am: adf2eec803 am: 956d346029" into rvc-qpr-dev-plus-aosp