Merge "Reduce timeout of dismissing pairing dialog on success"