Merge "Fix: Remove save/restore of EL2 timer registers" into integration