Merge "Fix search view tests on handheld devices" into nyc-dev
am: 8e2e40a

* commit '8e2e40a28a53579fe91ce80d770519daa060ea3c':
  Fix search view tests on handheld devices

Change-Id: I3412d5566d49e345128073c0bd6e8a95b6dbca6c