Merge "Fix for the missing focus in WebView form fields."
am: 2708da7bf6  -s ours

Change-Id: Ia27a1468e2e81444562d592a0c9d5e4f48cc776c