Merge "mediaresourcemanager: handle the case when there's no client holding resource with the same type" into mnc-dev