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