Merge "Add config resource specifying WallpaperManagerService"