Merge "Fix some issues in PhotoPicker" into sc-mainline-prod