refactor initial state handling
Merge branch 'bug-897082-contact-and-spaces' into demo-3-ui-tour-spaces