Merge "Unit tests for TileLayout"