Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da am: f19fdfb08d" into nyc-mr1-dev-plus-aosp