Merge "Report freezable state changes even when pending freezes are cancelled." into main