Merge "Fix list_for_each_safe macro"