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

* commit '53c116f5da0c5a8d0da5f046b892d7a106d4937a':
  QS: Use current tile state when removing custom tiles

Change-Id: I73edc9a6029ed38e41abd0d8908a345b4631ad1e