Merge "Changed logic about how to check if VRI replaced its surface."