Merge "NavigationView handles checked status" into lmp-mr1-ub-dev