Merge "Call stopInflation() on bubbles we're removing." into rvc-dev