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

* commit '58514937628dfcf3b2949e4cbc45d5526ecb8019':
  Resized thumbnails; async; extend MatrixCursor.