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

Change-Id: I6d1f172c7c130d0d09bc58a2360ef167a97608a7