am 60d5509d: Merge "Tidy up styling and tinting in NavigationView" into lmp-mr1-ub-dev

* commit '60d5509d4ce055532645a889d29f4201e6bc4512':
  Tidy up styling and tinting in NavigationView