Merge "Check connected devices in addition to paired ones when matching"