Merge "Improve caching behavior of thumbnails" into oc-dev