Merge "Don't crash good-citizen restore session clients" into lmp-dev