Merge "fix(el3_runtime): restore SPSR/ELR/SCR after esb" into integration