Merge "Add PAIRED_DEVICE_OS_TYPE_NONE" into main