Merge "fix emoji clipping in hw draw path" into klp-dev