Merge "QS: Hacks to fix bigger problems in TileService binding" into nyc-dev