[nautilus] (5 commits) Non-fast-forward update to branch wip/antoniof/flow-box-preparation

[António Fernandes <antoniof src gnome org>]

The branch 'wip/antoniof/flow-box-preparation' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  cb33115... view-icon-controller: Implement thumbnailing prioritization
  b450444... general: Rename 'canvas' to 'grid' in enums
  4721de0... general: Remove canvas view
  7daa3e6... global-preferences: Remove now-unused preferences
  efab85b... files-view: Drop unused vfunc

Commits added to the branch:

  7f9a1d9... view-icon-controller: Implement thumbnailing prioritization
  47b346b... general: Rename 'canvas' to 'grid' in enums
  26c7bdc... general: Remove canvas view
  6bf79f6... global-preferences: Remove now-unused preferences
  d164614... files-view: Drop unused vfunc