Merge "resourcemanager: fix reclaim issue with conflicting codecs" into main