Merge "Increasing wait time after mode switch." into ub-launcher3-qt-dev am: 5a93e5d895
am: a417f95921

Change-Id: I9d4b490d0b3b046fa7dde3e274f258d36b439e2c