Merge "Address UI change request for injected services" into qt-dev