am db90aa44: am 3aa8c4cc: am 3cc9602c: am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"

* commit 'db90aa44af0d820abc358ed381befaf4e9552322':