Merge "Move all logic of navigation bar to NavigationBarController(2/N)"