Merge "Update persist.sys.usb.config on runtime"