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

Change-Id: Ia491010fffb08f66d2f2f89e6ac9ffb818a71e1b