Merge "Move dataItemToEntry() off UI thread" into lmp-dev