Merge "Check the freeze policy when re-enabling Freezer, which might have...

Merge "Check the freeze policy when re-enabling Freezer, which might have changed when Freezer was temporarily disabled." into main