Merge "Adding support for smaller font set for size-constrained devices"