Merge "Keep wallpaper as a special-case in transitions" into sc-v2-dev