Merge "fix(rmmd): preserve x4-x7 as per SMCCCv1.1" into integration