Merge "Remove DRM IResourceManagerClient on session close" into rvc-dev