CLC-2018 - Setting menu has extra margin since last Foundation update

https://jira.media.berkeley.edu/jira/browse/CLC-2018