Merge "WallpaperManagerService:fix NPE happen in onDisplayReadyInternal method ." into main