Merge "TIF: Handle null main session" into lmp-dev