Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am:...
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5 am: 644cbd66
am: 00bfd276
* commit '00bfd276':
QS: Use current tile state when removing custom tiles
Change-Id: Iffa4c56927cbcf0c85e30013eb95e871dddbf0a1