Merge "Handle non-eligible paths in getOriginalMediaFormatFileDescriptor" into sc-dev