Merge "Fixed regression with search not reacting properly to on touch events." am: 8c3420c5f1
am: a9343bfd33

Change-Id: I80e2cba02dedda182e3c29466497783b1104bbb4