Merge "Fixed regression with search not reacting properly to on touch events."...
Merge "Fixed regression with search not reacting properly to on touch events." am: 8c3420c5 am: a9343bfd
am: 81380168
Change-Id: I045367a033da5b67353af30ce44362410eb056b6