Merge "chore(cm): reorganise sctlr_el1 and tcr_el1 ctx code" into integration