am 8c6b3b93: am daa95754: am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling"

* commit '8c6b3b93e2ebe8db06165f6378d86cac2c606171':
  Performance increase in thumbnail handling