Fix OnScrollListener support