Merge "Trim search before performing" into ub-gmail-ur14-dev