Merge "Update fastscroll" into ics-mr0