Merge "Fix settings tests where we relied on the resId." into main