Merge "Always reset focusedTask to -1 on reset" into sc-v2-dev