Merge "Always set sys.usb.ffs.mtp.ready during configure"