Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread