Merge "Apply Glif theme before using dynamic color." into tm-dev