Merge "Avoid adjusting top focused root task while clear task" into rvc-qpr-dev