am 9c1547f8: Merge "Fix NPE in NavigationView" into lmp-mr1-ub-dev

* commit '9c1547f89fff53eb2fc20f5726e9cfbf7655fc74':
  Fix NPE in NavigationView