Merge "remove unused layout method in TestUtils"