Merge "Prompt user to set device lock before deleting private space from Reset options" into main