Merge "CodecAsyncHandler: Fix race issue in async mode"