Merge "Fix a regression in assist when context is disabled" into nyc-dev