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