Merge "Fix clipping when text is multiple lines" into sc-qpr1-dev