Merge "Fix handling usb dialog for wall chargers."