Merge "Rename NavigationDrawerView to NavigationView" into lmp-mr1-ub-dev