Merge "Improve wallpaper CTS reliability"