Merge "Fix potential invalid memory access for concealment in decodeEnvelope()"