[ALOY-440] Dynamic picker fix, PR for 1_5_X branch
Merge branch 'ALOY-440d' into 1_5_X
Merge branch '1_5_X' of https://github.com/appcelerator/alloy into 1_5_X