Merge "Transcoder: Increase test timeout" into sc-dev