am 97a9341e: 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 '97a9341ee366c0f9af71b7e7a4e71900774f0dd8':
  Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE