am e647ddde: Merge "libgui: Fix CPU rendering on Surface"

* commit 'e647dddebb11a383c0d95b6dfd0cbe0998d9b644':
  libgui: Fix CPU rendering on Surface