Minor fix for ListPicker
Add ContextMenuStyle property to PropertyUI
Merge branch 'custom'