Merge "Workaround for wallpaper crash. (5191436)"