am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev

* commit '12c7a0c970dfa56391f1e7f7a8ed41348acb14c4':
  More UX updates around picking images.