am bd56a17d: am af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev

* commit 'bd56a17df26a3c7f4e32ca3be08fbf28f625dffa':
  More UX work for thumbnails, search, management.