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

* commit '644cbd668f2bd6ce2da90b445e918c445b71c851':
  QS: Use current tile state when removing custom tiles

Change-Id: I1669594028b9321ddd424e2ea3aadf601b92a94c