am b6a2978a: Merge "Performance increase in thumbnail handling"

* commit 'b6a2978a5118d66bcebc380b0c20e566b7cbdfda':
  Performance increase in thumbnail handling