Merge "Add a scrim to the wallpaper preview" into tm-qpr-dev