Merge "Update CtsViewTestCases to load different layout file for landscape mode" into pie-cts-dev