Merge "Revert "[Android WebView] Make web contents debugging controllable"" into klp-dev