Merge "Safeguard against no tiles in QS" into qt-dev