Refine mobile pairing confirmation (#6018)