Merge "Fix for the missing focus in WebView form fields." into oc-dev am: c34dec82a9
am: ab40d62d2c

Change-Id: I14d5910c5009a17f507b701aa461f862c4075152