Merge "Align menu items in NavigationDrawerView" into lmp-mr1-ub-dev