Merge branch 'kinetic_scroll' into android-test-plugins