Merge "Revert "Create flag for animating bubbles."" into main