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

* commit 'f4a2d27d3336b0ab4d4c61e550da4c52794ca7d7':
  Fix IllegalState in ContactSelectionActivity