Merge "Remove WebViewClassic specific test code" into klp-dev