am 7b61672a: am 3b76216f: (-s ours) am adee51c0: (-s ours) am 1cd781d5: am a1d699ba: Merge "Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE" into klp-dev

* commit '7b61672ada13bc150444dfbfe82178d5a0345474':