Merge "More tests for NavigationView" into mnc-ub-dev