Merge "DO NOT MERGE: Update WebViewTest#testLoadDataWithBaseURL to test the original url" into klp-dev