Blackberry fix for picklists.
#MBL-10307 Fixed
Merge branch '3.0.x' into develop