Merge "Add trace to generateCrop in wallpaperManagerService" into tm-qpr-dev