Merge "Fix activity thread."