Merge "Fix qs tiles disappearing when leaving edit"