Merge "Fix issue with relaunch of transiently-hiding task" into main