Merge "QS: Fix missing tiles" into nyc-dev