Merge "Update internal AutoScrollHelper to match support lib version" into klp-dev