Merge "Tests: attempt to wait until navigation mode settles after switching" into ub-launcher3-qt-dev