Merge "Remove old != new onScrollChanged check" into ics-mr1