Merge "Automatically show Safety Tile" into tm-dev