Merge "Override MIME type to match MediaStore behavior." into rvc-dev