Merge "Update Safety Tile config value" into tm-dev