Merge "Remove handling of EV_MSC/MSC_TIMESTAMP in Input"