Merge "USB connected notification and temporary USB options dialog"