Merge "Cherry Pick [Android] Properly handle cancelled scroll events" into klp-dev