Merge "enums.h: Combine related #defines into packed enums." into nextgenv2