Merge "QS tile lifecycle management" into nyc-dev