Merge "Rename bubble bar flyout fields" into main