Merge "Safeguard against no tiles in QS" into qt-dev am: 60aabc40a2
am: d4202413af

Change-Id: Ia4131b27e4e3622b4e2babfc6ddd43919109b027