Merge "Fix issue #5317970: Removing active wallpaper from manifest crashes phone"