Merge "Add PhotoPicker Settings Intent"