Merge "fix(context-mgmt): align the memory address of EL2 context registers" into integration