Merge of properly focus clicked input element in Webkit (#11854, #11297)

Change-Id: I4c313b55966bcbcd31a40bdd0bf561e887822e51