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

Change-Id: I4799a8a5a3cf3c68774f40a560a1198d9af61eb6