am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev

* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.