Merge change 5847

* changes:
  Adds new attributes for specifying icons to be used in the Contacts app.