Merge "Only resolve non-dynamic resource references"