Merge "Update default QS tile order"