Merge "Remove plugin logical from NavigationBarView (1/2)" into qt-dev