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

Change-Id: I169b5f68e07d0b9d042b23a86c3b7be828b8ec31