Merge "Fix IntDef's usages in the platform Transitions"