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

Change-Id: I1751ac571ceca0ea889034797204032c27558caf