Merge "Make sure shouldNotFreeze state change correctly triggers updates." into main