Merge "Add pid override feature to MediaResourceManager"