Merge "Fix NavigationBarController NPE"