am 0358def7: (-s ours) am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread

Merge commit '0358def77633b6548da06985cb22955a7e85abac'

* commit '0358def77633b6548da06985cb22955a7e85abac':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.