Merge "Increase transcoding timeout" into sc-mainline-prod