am b147bab7: (-s ours) am 53b71a65: 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 'b147bab71c6e81c4cd266dce4b3efe9a49befacd':