Merge change 4168

* changes:
  replace webview hashmap with static class