am 2280e278: Merge "Avoiding blocking worker thread when adding icons to DB" into ub-launcher3-burnaby

* commit '2280e27842671d21fa29b6d7bd22b5912704471d':
  Avoiding blocking worker thread when adding icons to DB