am d38ce89c: (-s ours) am f9e8d7d0: am 13eeaa6f: Merge "Fix wrong contact being hidden from favorites" into klp-dev

* commit 'd38ce89c339edfebd10828b1bff26d4f90071e83':