Upgraded ContactPicker to use API 5 where available.