Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev