Merge "Winscope: Update IntDef mappings" into main