Merge "Reenabling switching between nav modes in tests" into ub-launcher3-qt-dev