Merge "Update bubble bar expanded view when bubble bar location updates" into main