Merge "Recover from missing #beginSession."