Merge "Update QS custom tile icons when they change" into nyc-dev