Merge "fix CTS issue for case testSetOnScrollListener"