am a339f2e5: am 1434a407: Merge "More tweaks to match UX spec." into klp-dev

* commit 'a339f2e5bbcfa94e9ba2cee9734a699816f3a413':
  More tweaks to match UX spec.