fix scrollYChanged and add short circuiting back