Merge "Fix entry lookup in getDurationMs" into main