Move device creation back to before ApplyChanges is called.  Along with the PreparingDeviceSettings as well.
Add comment to mod
Merge pull request #1751 from kjpou1/develop

Develop - Fix for Issue #1750 - Move device creation back to before ApplyChanges is called.
Merge back from upstream with that thing we already merged ololo