Merge "Catch MediaCodec#stop IllegalStateException" into sc-mainline-prod