Merge "Updating overscroll assets for large UIs" into ics-mr1