Merge "Fix condition when should focus on running task" into main