Merge "Change option to lock private space from never to after device restart" into main