Merge pull request #5677 from keymanapp/fix/developer/cherry-pick/5577-import-from-layout-dirty-flag fix(developer): ensure file modified after import from layout 🍒