Merge "Add preference category to USB transfer settings"