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

Change-Id: I527fc6e849523b95521c6efae016b3b8a86255ca