Merge "Remove unused frozenBeforeDestroy" into main