Merge "Search for runtime resource overlays in subdir." into cw-f-dev