Merge "Updated bubble bar position to be center aligned with the hotseat" into main