Merge "Add null checks in wallpaper service" into sc-dev