Merge "Add use of NavigationView without drawer" into mnc-ub-dev