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

Change-Id: Icfffb0b5eb08d349cdd67c90870e4fc7e9f5a352