Merge "Update the CTS tests to avoid failure on narrow screen." into jb-dev