am 9c35d8ec: Merge "Small changes to help AppsCustomize scrolling." into ics-mr1

* commit '9c35d8ec4ecae06a844f013c17fdd90d0898e336':
  Small changes to help AppsCustomize scrolling.