Merge "Fix issues where the task was still touchable in overview" into sc-v2-dev