Fix: SPA navigation (once again)#3554

mattgperry merged 2 commits intomotiondivision:mainmotiondivision/motion:mainfrom

MrVoshel:mainMrVoshel/motion:mainCopy head branch name to clipboard