Merge "Marking testPrivateSpaceLockingBehaviour as disabled." into main