Merge "Fix potential freezer thrashing" into sc-dev