Merge "Adjust grid cell visualizations." into tm-dev