Merge "Remove kStatusInvoke & kStatusDraw"