Merge "Handle taps on bubble bar flyout" into main