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

* commit 'd77d45c36c6a551e9d2c0e7a87ba6b17f68813c5':
  Fix issues with Drawable states in NavigationView