Merge "Add app:menu attribute to NavigationView" into lmp-mr1-ub-dev