Merge "Add PickerMediaColumns to the MediaStore API"