Merge "Merge "Only inflate & add if it's a bubble" into rvc-dev am: 3ef506d5 am: 5fd277e8 am: d7b21537" into rvc-qpr-dev-plus-aosp