Merge "Fix spurious restore session timeouts" into lmp-dev