Merge "Remove DiffStatus::opaque_diff"