Merge "Add 5s ANR delay during transcoding" into sc-dev