Merge changes Ib658efa6,I0f84f15c

* changes:
  Create a common widget (ContactPhotoView) for a contact photo and its optional badge.
  Remove unnecessary call to StatusBarNotifier.updateNotification().