unity: don't update launcher progress on wrong job type
wb_presets: update and expand Nikon D7100 (thanks to Chris Siebenmann)
(cherry picked from commit 25a049a0cd889e636e1161a4fa6026f4ffd54f18)
Fix disturbing gtk warning message
Merge remote-tracking branch 'upstream/master' into gtk3-upstream

* upstream/master:
  wb_presets: update and expand Nikon D7100 (thanks to Chris Siebenmann) (cherry picked from commit 25a049a0cd889e636e1161a4fa6026f4ffd54f18)
  unity: don't update launcher progress on wrong job type