Merge "Allow overwriting "All Contacts" by a custom text (e.g. "All Friends") Bug:2116002"
Attempting to fix the pinned header in contacts.

Partial - work in progress.

Change-Id: I8df0115df84e86be878f1b1b6462a6eb9380863f
Merge commit '1a848b1f6ab34d9cfe90ed13f20bb9b5131246d0' into HEAD

* commit '1a848b1f6ab34d9cfe90ed13f20bb9b5131246d0':
  Attempting to fix the pinned header in contacts.
Modify ImportVCardService so that it does not rely on a stale constructor.

We are not 100% sure whether this change is really correct though all tests are in green.

Related change: I16e487fa

Change-Id: I0a5aa1ea587c6b2d25ce90ba0a23bc14ea8a12f5
Revert "DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer"

This reverts commit c7f25410daccf9e14c1726fd3e778910d894f243.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Making call log work again

Change-Id: I2de6d8bd0f7bf5a68e15a692671cdcb6c68ab016