Merge "Add flag for the automatic bt device type categorization" into main