am 668218bc: Merge "Performance tweaks/ cleanup for loading sender contact photos" into jb-ub-mail-ur8

* commit '668218bc30896300160957bd99377ef769a79084':
  Performance tweaks/ cleanup for loading sender contact photos