Merge "Fix framework/base/tests for use_resource_processor: true" into main