Merge "Update the size of SurfaceControl after display changed"