Merge "Fix wallpaper transition cts test failures"