Merge "libgui: Remove unnecessary casts in SurfaceControl"