Manually apply remaining changes from https://github.com/cefsharp/CefSharp/pull/507