Merge "Only show populated fields and have an Add button instead"
Merge "Initial integration of search into the two-pane activity"
Remove instance hacks, now that findFragmentById works

Change-Id: Id31aa717299a575ed8612b197f72e71bab508174
Merge commit '9c3f337422f5147220d85c0779daf6c10c4e96f7' into HEAD

* commit '9c3f337422f5147220d85c0779daf6c10c4e96f7':
  Remove instance hacks, now that findFragmentById works
Revert "DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer"

This reverts commit c7f25410daccf9e14c1726fd3e778910d894f243.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Revert "DO NOT MERGE Sticky tab rule: Remember the last tab that was used to call"

This reverts commit 00ea05799040a55f85cc449fede956983003af97.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
	src/com/android/contacts/DialtactsActivity.java
	src/com/android/contacts/PhoneDisambigDialog.java
	src/com/android/contacts/ViewContactActivity.java
Revert "Implement granting of URI permissions from picker.  DO NOT MERGE."

This reverts commit 958aca24fb348cd8795a952df7de299f09e66d2d.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java