Merge "Fix crash in getPhotoPickSize" into klp-dev