Merge "Allowing Private Space unlock without device lock." into main