Fix overflow issue with pickers after merging up with the latest master branch