Merge "Fix NPE in NavigationView" into lmp-mr1-ub-dev