Merge "Add a flag to support deleting private space from Settings when lock is forgotten" into main