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

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