Merge "context: TPIDR_EL2 register not saved/restored" into integration