Merge "Use visibleNonExcludedTask as runningTask in 3 button flow as well" into main