Merge changes Ied60cbab,I2769b0ad into main

* changes:
  Only pilfer once in InputSession.
  Refactor InputSession dependencies.