Merge "Clean up USB notifications:"