Merge "Switches from Gesture nav if 3P Launcher is set as default" into qt-dev
am: c5d8ea1536

Change-Id: I610afea4e533589dec44297bb77f1a90002a7522