Merge "Update SurfaceControl buffer size when increasing pointer size" into sc-v2-dev