Merge "Prevent no tiles in QS" into main