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

Change-Id: I54ba5ccf6ee282c838f9793f12561dd0fd5ad2d0