Merge "Fix clang-tidy warnings in mediaresourcemanager."