Merge "Introduced ContactTileSquare."