cairo createdrollback changes from release preparation of Cairo