[widget] Remove differences with upstream