Merge "Never clear QS tile state." into pi-dev
am: 61ce516480

Change-Id: I18bbb37a0e17d00df6c0d7afd22cdc9229a0923e