Merge "Move work off UI thread"