Merge change I517b266a into eclair

* changes:
  [Issue 2165144] Fixing managed delete dialogs in ContactListActivity