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

Change-Id: I2ad45500377e1e1a8b4ce550a058eec7facbde7f