Merge "fix 2453680 - acore NPE on startup: setWallpaperPosition"