Merge change 9669

* changes:
  Take density in to account when reordering playlist items.