Merge branch 'ui-tour-demo' into demo-3-ui-tour-spaces