Merge "Getting rid of hack where the wallpaper offset was being deferred"