Merge "Revert "USB connected notification and temporary USB options dialog""