am 84994295: (-s ours) am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev

* commit '849942950e50f5f53c5fd22a7a5641e9d496fdeb':
  Tweak vertical gap of Emoji palette. DO NOT MERGE