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

Change-Id: If5bde9600167a3d508bef5377d31e6d8db2635c2