Merge "LiveSession: reliable switch" into lmp-dev