Merge "Remove unneeded overriding SessionCallback.onSession2TokenCreated(token)" into main