Merge "Implement persistent permissions for Usb devices"