am e73f8619: am f4a2d27d: am 4c61147c: Merge "Fix IllegalState in ContactSelectionActivity" into klp-dev

* commit 'e73f8619e7d4d028811d951b8890973813b9ba3a':
  Fix IllegalState in ContactSelectionActivity