am caee47f0: Merge "Preparation for deleting WebViewClassic" into klp-dev

* commit 'caee47f096403068f02c41a91f8dad1aa5d13169':
  Preparation for deleting WebViewClassic