Merge "Permit conditional registry of mediaserver extensions"