Merge "Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a am: c06a5dab" into rvc-d1-dev-plus-aosp