Merge "WallpaperManagerService:fix potential null pointer exception in onDisplayRemoved method." into main