Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp * commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f': Remove overscrolling