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