am 7e7ffedd: Merge "Ensure Buttons have a disabled text color state" into lmp-mr1-ub-dev

* commit '7e7ffedd3d9b4b806edd6c36615742287472359d':
  Ensure Buttons have a disabled text color state