Merge "Separate Usb permissions from Usb settings"