Merge change I511ba352 into eclair

* changes:
  Remove tabs, join, and aggregate badge from ViewContactActivity