Merge \"QS: Fix clipping for some font sizes\" into nyc-mr1-dev
am: 8d947520c3

Change-Id: I218ec961a809cd75d4f8b83107273d733e4a0a36