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

Change-Id: Ib2f1cb8a05a2b53fccf4bef9e3602b78ee525f5a