Merge "Accessiblity scroll event firing callback not properly reset." into jb-dev