Merge "Merge "Fix for the missing focus in WebView form fields." into oc-dev am: c34dec82a9 am: d2cca60d09" into oc-dr1-dev-plus-aosp