Merge "EffectBundle: Fix sessionNo allocation"