Merge "Remove eventuallyExpectOrNull"