Merge "Avoiding overlay activities when usb device is attached." into main