Merge "Fix mediadrmserver not finding IServiceManager instance"