Merge "Update TimerFileDescriptor to support different task types" into main