Merge "Fixing PagedView bad snap-back decisions" into ics-mr1