Android: Fixed shortcut launching
Merge remote-tracking branch 'upstream/master' into shortcutfix
Merge pull request #1005 from mfleisz/shortcutfix

Android: Fixed shortcut launching