Merge "Add a flag to enable auto lock feature for private space" into main