am ae59980c: am 58514937: Merge "Resized thumbnails; async; extend MatrixCursor." into klp-dev

* commit 'ae59980c24cfaebc0654a01f621b344103b3bcd4':
  Resized thumbnails; async; extend MatrixCursor.