Merge "Fix incall music flag entry in type converter"