Merge "Resolve resource ID at runtime to stabilize tests"