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