Merge "Change default USB configuration to a RestrictedPreference" into tm-dev