Add null check on layout before deleting from tempstore.

johntarlingrequested to merge
issue/mercury_editor-3554039:3554039-php-error-when into 3.0.x

Closes #3554039

Merge request reports