Merge proposals dependent on lp://qastaging/~sil2100/cupstream2distro-config/thumbnailer_add

1. thumbnailer_add
2. Dependent merge proposals