Merge "Unbind TileService onNullBinding" into tm-dev