BRANCH SP-1280:

  adjusted spacing cell so that it won't be drawn if there are no grouped_columns
  made expand button in Shelf remember the original width before expanding so it contracts better