Merge "QS: Fix default icon handling for services" into nyc-dev