Merge "Small changes to help AppsCustomize scrolling." into ics-mr1