Merge "Jank: not blocking UI thread when starting a task"