Merge "Handle touch on bubble bar while animating" into main