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

* commit '056c610c9ba83fbf68e15fa4557620dc7820f087':
  Performance increase in thumbnail handling