Merge "Modify UiAutomator cts tests and app to improve scroll check" into jb-mr2-dev