Merge "Fix issues with Drawable states in NavigationView" into lmp-mr1-ub-dev