Make single-story context actions always appear above multiple-story actions. (#541)
Merge pull request #543 from dosiecki/master

Android: Quick fix for #541