Merge "WallpaperCropper has no tests, it doesn't need junit"