Merge "WM: Mark task overlays as trusted overlays"