Merge "resourceloader: Make tests less susceptible to timestamp races"