am b761f3e4: (-s ours) DO NOT MERGE - the scroll drag area was too small, and should have come from a resource anyway.

Merge commit 'b761f3e49afa140623f0df6a5e6645c05b78be63'

* commit 'b761f3e49afa140623f0df6a5e6645c05b78be63':
  DO NOT MERGE - the scroll drag area was too small, and should have come from a resource anyway.