Merge "Fix HardwareRenderers becoming invalidated by TRIM" into main