Merge "Avoid recreating tiles when reducing the amount of QS tiles visible" into main