Merge "Making second argument configurable in wallpaper intent function"