Merge "Bug fix: getDuration vs. getDurationTimeline"