Merge pull request #466 from n8fr8/master

Mostly UI with a few crash/stability fixes
updating androidemojiinput submodule to fix build issue