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

Change-Id: I61cee3682bee5ec034ee7f942da97440c9c6ea83