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