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

* commit '91f16b1b9c12e897d15198953684d9c7731ca47a':
  libgui: Fix CPU rendering on Surface