Merge "Fix search view tests on handheld devices" into nyc-dev