Merge "Fix downgrade wallpaper restore bug" into 24D1-dev