Merge "Adapt SurfaceControl to libgui API for display info"