Merge "Remove gear from usb preference" into pi-dev