CLC-2891 - Fix the _picker_shown error
https://jira.media.berkeley.edu/jira/browse/CLC-2891
Merge pull request #1856 from christianv/CLC-2891

CLC-2891 - Fix the _picker_shown error