Merge "QS custom tiles - better handling of invalid icons" into nyc-dev