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