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