Merge "Fix CTS case testScrollTo." into jb-dev