Corrected application of CV's mask on state change (closes #4162)