Merge "Fix race condition between loading wallpaper and unloading."