am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used...
am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
* commit 'ee1ff0da':
Do not merge. Save / restore the last used emoji category