Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1