Merge "Interrupt bubble animation on stash change" into main