Tidy up restoreWindowGeometry

Refs #9970
Improve variable names

Refs #9970
Merge branch 'feature/9970_refactor_project_serialisation' into develop