Merge "Add bluetooth address check to determine a valid bluetooth device" into main