Merge commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp * commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705': Fix bug 2562240 and clean up scrollbar behavior
Merge commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp * commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705': Fix bug 2562240 and clean up scrollbar behavior