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

* commit 'b21d78f577fffb717c3b52a83e0e54e3f4867567':
  Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE