Merge "Enable CloseFrozenAppSockets feature on V+" into main