Merge "Settings entry for private space auto lock option" into main