Merge "Reset top focused root task when task hidden" into sc-dev