Merge "Associate device id with getWallpaperWindow" into main