Merge "the scroll drag area was too small, and should have come from a resource anyway."