Merge "Add mechanism for a task's windows to be trusted overlays" into sc-dev