Merge "resource_manager: fix cross-type reclaim"