Merge "Reenabling switching between nav modes in tests" into ub-launcher3-qt-dev
am: 2c99205461

Change-Id: I07040b5da89c565ad026b6c50abd9b991df238ca