Merge "Update bubble bar to match visual spec" into main