Merge "Edit list uses timescale from movie header"