Merge "Create frozen flag for OomAdjuster rewrite" into main