Increasing performance thumbnail generation (from jellybean-mr1)

Change-Id: I1d6b34a931f14fb3c7c6e7f3a30b45c52059be7e
Merge "Increasing performance thumbnail generation (from jellybean-mr1)" into gingerbread