Merge "Add MediaStore API to get original media file descriptor" into sc-dev