Merge "Resurrecting sessions when AiAi is bound for the first time" into sc-dev