Merge "Rename the bubble position to be bubbleXY for clarity" into main