Merge "Fix crash in add QS tiles"