Merge "spmd: ensure SIMD context is saved/restored on SPMC entry/exit" into integration