Merge "Move folder query off UI thread"