am f9e8d7d0: am 13eeaa6f: Merge "Fix wrong contact being hidden from favorites" into klp-dev

* commit 'f9e8d7d04dcfcda4e2239a4068c7bc0ccf435af1':