Merge "Update visuals of bubble bar education views" into main