am 8ee93730: (-s ours) am 8e660c4d: am 50d38750: (-s ours) am 31197546: (-s ours) am 4315914c: am 0094eb8f: Merge "Fix contact tile horizontal animations when swiping shortcut card DO NOT MERGE" into klp-dev

* commit '8ee937308db00997ba5b122dad0974f7218ef054':