Merge "Adding ability to delete previously saved wallpapers" into jb-ub-now-indigo-rose