Merge "Refactor TranscodeHelper for sysprop changes"