Skip overlay2 diff tests when using naivediff Upstream-commit: f3f9b3dac9114cfe0f8bf0380dd7343cc58d3a1c Component: engine