Merge "Add auto lock preference inside private space settings" into main