Merge "Introduce DisplayNavigationBarController"