Merge commit 'ac492e181a21749858ebf30dc1f5bcb0ded4383c' into eclair-mr2-plus-aosp * commit 'ac492e181a21749858ebf30dc1f5bcb0ded4383c': tweak snap scroll