Merge "Have Typeface pass a cookie of -1 to search through all assets" into tm-dev