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

Change-Id: Icef93a6bf78f8a25c9ba307bfd56e17f28407a79