Who was whitney houston dating before she died