Merge "Fix crash with OpenGL wallpaper Bug #5216751"