Merge "Fix early session termination in FalsingManager" into nyc-dev