Merge "Fix issue where tasks were not reliably marked as Perceptible" into main