Merge "Adjust scope for TaskOverlayHelper" into main