Merge "Add debug logs for private space auto-lock" into main