Merge "Tidy up styling and tinting in NavigationView" into lmp-mr1-ub-dev