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

Change-Id: Iea27a78acb414ec960037eaefe7ad5a97c96e3b2