Merge "Keep track number in sync when playlist has the same song many times"