Merge "QS: Fix clipping for some font sizes" into nyc-mr1-dev