Merge "Avoid adjusting top focused root task while clear task"