Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev