Merge "Fix bug where shade is infinitely squishy after wallpaper change"