Merge "USB permission and resolve activity refactor."