Merge "Skip backup/restore of wallpaper package" into rvc-dev