Merge "Adding flag for font scaling tile" into tm-qpr-dev