Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread