am 33c086b1: Merge "Fix SubMenu in NavigationView" into lmp-mr1-ub-dev

* commit '33c086b170ad408746728df4a4b5d6d9f10e7508':
  Fix SubMenu in NavigationView