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