Merge "Fix underrun count for static tracks"