Merge pull request #16210 from mattwire/caseformactivity_simplifyif