Merge "After switching nav mode, wait for the sysui mode to sync" into ub-launcher3-qt-dev am: 0d5bd65e6e
am: 5cb4990ffe

Change-Id: Idfaaef95e97ad9cf8b133782a66f7dda5bee908a