Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp * commit '85a8dcec5460edda72e9917d4f02ad1b6a133251': Only honor the scrollbar mode at the minimum zoom