New simpler (sort of) logic for display of the preliminary screen
Merge pull request #496 from SpiderOak/issue-495-Orange-preliminary-screen-always-appearing

New simpler (sort of) logic for display of the preliminary screen