Merge "Update bubble bar location in shell" into main