Issue 20865: Fix for picker in Firefox
Issue 20865: Reverted unnecessary changes to picker
Merge pull request #621 from lynnaloo/20865

20865 - Fixes for pickers in Firefox