am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev

* commit '06e1bdaa2582293193df7c1b1dd0784b9c327b87':
  Make emoji separators