Merge "Never clear QS tile state." into pi-dev