am 6c9d43bb: (-s ours) 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 '6c9d43bb':
Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE