Merge "Revert "Add concurrent card graying for immune spaces""