Avoid theme compatibility issues relating to .updated elements (updates #31306)