Merge "QS: Use current tile state when removing custom tiles" into nyc-dev