Merge "Remove code preventing scrollTo(0,0)"