Merge "Skipping testPrivateSpaceLockingBehaviour for LS devices." into main