am 49a250a8: (-s ours) am 46b9a3fb: (-s ours) am 7e1f0464: am 90092bfb: Merge "Restricted the tap target for "All Contacts" to the "All Contacts" button alone.  DO NOT MERGE" into klp-dev

* commit '49a250a884681b501591f55b06c5c173d0aa867c':