Merge "Enabled wait for wallpaper draw code, but reduced timeout to 500ms"