Merge "Remove legacy bubble bar flag" into main