Merge "Add extra null-checks to WallpaperManagerService." into sc-dev