Merged [21375] and [21376] - fixes to IKImagePickerForTiger [21372]