am 71f16f90: (-s ours) am c7f25410: DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer

Merge commit '71f16f90d71ce8d9eeb79710841cc680a3bf0541'

* commit '71f16f90d71ce8d9eeb79710841cc680a3bf0541':
  DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer