Merge "refactor(context mgmt): refactor EL2 context save and restore functions" into integration