Merge "Fix text cropping in pairing dialog" into main