Merge "Follow-up to typography changes to Vector"