Merge "fix(fvp): correct ehf priority for SPM_MM" into integration