am 0b1df979: am f06daa26: am 380c457c: am 67bdd042: am eae81394: am 8acfb5e6: am 1935d8ee: am 55fd8c23: am d2cafb03: Merge "Temporary disable saving keys of emoticons to recents"

* commit '0b1df979':