am b2f46f83: Merge "Keep the selected state of items in NavigationView" into lmp-mr1-ub-dev

* commit 'b2f46f835d8c4cbe9385084beac111e8c9dfe789':
  Keep the selected state of items in NavigationView