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

Change-Id: I7c4411fd05524b83857b00b3c4106611cc813f6a