Merge "Disable tabbed view support for UsbResolverActivity."