Merge "Unbind TileService onNullBinding" into udc-dev