Merge "Disallow empty search string" into ub-gmail-ur14-dev