Merge pull request #9795 from Filoppi/fix_controller2_default_device Fix controllers after the first one not defaulting to the default device