Merge "libgui: Fix CPU rendering on Surface"