Merge "QS Edit: clean up tile adapter" into nyc-dev