CLC-4050: Gear menu showing up under Activity selection menu
https://jira.ets.berkeley.edu/jira/browse/CLC-4050
Merge pull request #2768 from christianv/CLC-4050

CLC-4050: Gear menu showing up under Activity selection menu