Merge "cas: fix UAF in descrambler -- DO NOT MERGE" into oc-mr1-dev