Yep, he just got back... The terrace scene was beautiful, showed how close they would've been at some point.
Unfortunately Shiv meets Mahi always at the wrong time and she takes her frustration out on him (Golgappa meeting and the latest fall scene).
I'm sure once they start to meet more often, and begin to know each other better, they will take this relationship to a new level.