Merge "Avoid crash in loading images" into ub-contactsdialer-a-dev
am: 7de2068c2d

* commit '7de2068c2dd8ab20f8ae5f30bb238ee3d06984e3':
  Avoid crash in loading images