Merge "[VRR] Reset relevant values when destroying surface" into main