- merge: "recovery: Compatibility with upstream minui change"
- merge: "use correct USB PID for adb and new PID for adb+ums"