Merge "Add MediaStore API to bypass transcoding"