Merge "Move setting to disable automatic USB routing" into lmp-dev