Merge "Configure policy of mediaserver threads"