Merge "Add a way to get header views from NavigationView" into mnc-ub-dev