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

Change-Id: I6e15eecad9aa9d8426be554f3d6bdf40ae53f5a7