Merge "Allow mediaserver to find "audio" service" into qt-dev