Merge "Removing support for menu button from NavBar" into qt-dev