Merge "Add configuration for activity thumbnails" into klp-modular-dev