Merge branch 'master' into blender2.8

- Undo that changes modes currently asserts,
  since undo is now screen data.

  Most likely we will change how object mode and workspaces work
  since it's not practical/maintainable at the moment.

- Removed view_layer from particle settings
  (wasn't needed and complicated undo).

source/blender/imbuf/intern/anim_movie.c

@@ -68,7 +68,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_global.h"
 
 #ifdef WITH_AVI
 #  include "AVI_avi.h"

source/blender/imbuf/intern/thumbs_blend.c

@@ -37,7 +37,6 @@
 #include "BLO_blend_defs.h"
 #include "BLO_readfile.h"
 
-#include "BKE_global.h"
 #include "BKE_idcode.h"
 #include "BKE_icons.h"
 #include "BKE_library.h"

source/blender/imbuf/intern/util.c

@@ -43,7 +43,6 @@
 #include "BLI_fileops.h"
 #include "BLI_string.h"
 
-#include "BKE_global.h"
 
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"