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

Change-Id: I8d70cf931dfbf23ebe9fd0e57d52b9be03d51617