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