Merge "Reduce memory usage of default thumbnail" into klp-dev