Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread