Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev