am 6874b17d: am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev

* commit '6874b17d7937a4616a119aea58c8a9c8acef4e7f':
  Disabled states, more UX work, bug fixes.