am f27cb0e6: resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polish

* commit 'f27cb0e6b1edb2a53de64fdd12d25f400a3acdd9':
  Using custom threadpool executor instead of the one defined in AsyncTask