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