Merge "Filling in content values on the worker thread" into ub-launcher3-qt-dev
am: 587421adbf

Change-Id: I4854343932b386d74e7b516032f8b36e5ffd185e