Merge "Update QS customizer add tiles string." into pi-dev