Merge "Fix wallpaper NPE caused by user switching before IWallpaperService connection"