Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev