Merge "Fix NavigationView's text appearance" into lmp-mr1-ub-dev