Merge "Move blockingTasks to run outside transaction"