Merge "Wire up flyout to new bubble animation" into main