Merge "Tests: waiting for nav bar to match nav mode" into ub-launcher3-qt-dev am: b4ff312181
am: 177b810755

Change-Id: I5e8d7bfd130895cdef4881c6df81c941efd54757