Merge "GestureNav: Fix broken split screen navbar" into qt-dev am: 730b22c229
am: e8fa8c6230

Change-Id: If17ba6fc9c70fd81f2002c91ba52beace9f6f834