Merge "Don't look up a sender icon if we don't have a sender" into ub-gmail-ur14-dev