Fix issue with Import Settings fixes#10709 (rebased onto develop)



This is the same as gh-1032 but rebased onto develop.

----

Fixes a bug with importing screens.