Merge changes I17264f0e,I0581978f

* changes:
  Limit transcoding size workaround to windows
  Workaround to fixup MTP transcode file size