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

Change-Id: I7c7a0e3e74ccea22cc3107b2bb96f01f4c83330c