MBS-5958, sanitize track positions when collapsing a disc or submitting the tracklist page.
Merge branch 'mbs-5958' into beta

* mbs-5958:
  MBS-5958, sanitize track positions when collapsing a disc or submitting the tracklist page.