Merge "fix(cm): add barrier before el3 ns exit" into integration