Merge "Remove settings tasks on private space deletion" into main