Merge "Update bubble bar flyout according to spec" into main