am ed0924c4: merge from open-source master

Merge commit 'ed0924c45329589b9573fc0fb370167c5f6f3602'

* commit 'ed0924c45329589b9573fc0fb370167c5f6f3602':
  ContactsBadge: When there is no data to display, show it to the user