Merge "RFCOMM: fix connection timeout during security setup"