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

Change-Id: Iebbd151de465664428e794a7ae7844e9aab924f1