Merge "resourceloader: Make timestamp handling more consistent"