Merge "Avoid crash when unbinding wallpaper am: b989a5e9de am: 1c54b5d6bf"