[JENKINS-19649] fix issue where view mask and clean can get stuck in an enabled state