Merge "Wallpaper software rendering fallback Bug #8230579"