Merge "Add flag for bubbles animation changes" into main