Merge "fix(cm): add more system registers to EL1 context mgmt" into integration