Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev