Merge "Fix non-visual Context in ImageWallpaper" into sc-dev