Merge commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7' into eclair-plus-aosp * commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7': Handle restore of the original naive wallpaper backup schema
Merge commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7' into eclair-plus-aosp * commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7': Handle restore of the original naive wallpaper backup schema