Partial revert of f0607639

Address test failures

Guard context reset in DisplayWGL::makeCurrent with !mUseDXGISwapChains

BUG=chromium:1004117

Change-Id: I9b6eb7bc83a6e4b1a21fa0703404e41c6090730d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1913314Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>