Merge "Retire AsyncTask in BuiltInWallpaperAsset" into tm-dev