Merge "Auto lock private space on device restarts" into main