Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev