Merge "Remove all Settings tasks from Recents when PS is locked" into main