am 2e04f1a0: Merge "Move dataItemToEntry() off UI thread" into lmp-dev

* commit '2e04f1a0598bba3f58757eaa217b53bcf7d9e0a4':
  Move dataItemToEntry() off UI thread