Merge "QS: Fix crash in tile API" into nyc-mr1-dev