Merge "SPM: Change condition on saving/restoring EL2 registers" into integration