Merge "Only inflate & add if it's a bubble" into rvc-dev