Merge changes from topic 'directoryfragment-stable-ids'

* changes:
  Wrap up the stable ID refactor.
  Re-enable sorting in the DirectoryFragment.
  Fix file deletion after the move to Model IDs.
  Transition selection to use Model IDs.
  Switch DirectoryFragment code to use model IDs.