am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev

* commit 'ab99b39d7d152de35ea02a364190ff325da4015b':
  fix emoji clipping in hw draw path