Merge pull request #22666 from braders/avoid-php-notices-activity-form